Skip to content

to_opt_poly_X_pred -> as_X_clause #125153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 17, 2024
Merged

to_opt_poly_X_pred -> as_X_clause #125153

merged 1 commit into from
May 17, 2024

Conversation

compiler-errors
Copy link
Member

r? lcnr

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 15, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 15, 2024

changes to the core type system

cc @compiler-errors, @lcnr

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@lcnr
Copy link
Contributor

lcnr commented May 15, 2024

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 15, 2024

📌 Commit 743a332 has been approved by lcnr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 15, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
lcnr
lcnr reviewed May 15, 2024
View reviewed changes
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Outdated
@@ -2739,7 +2739,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
| ObligationCauseCode::ReferenceOutlivesReferent(..)
| ObligationCauseCode::ObjectTypeBound(..) => {}
ObligationCauseCode::RustCall => {
if let Some(pred) = predicate.to_opt_poly_trait_pred()
if let Some(pred) = predicate.as_projection_clause()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if let Some(pred) = predicate.as_projection_clause()
if let Some(pred) = predicate.as_trait_clause()

@bors
Copy link
Collaborator

bors commented May 17, 2024

☔ The latest upstream changes (presumably #125203) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 17, 2024
@compiler-errors
Copy link
Member Author

rebased

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented May 17, 2024

📌 Commit 2025e44 has been approved by lcnr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 17, 2024
@bors
Copy link
Collaborator

bors commented May 17, 2024

⌛ Testing commit 2025e44 with merge 1a73979...

@bors
Copy link
Collaborator

bors commented May 17, 2024

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 1a73979 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2024
@bors bors merged commit 1a73979 into rust-lang:master May 17, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 17, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1a73979): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 0.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 1.2% [0.1%, 2.3%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.0% [-1.0%, -1.0%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [-1.0%, 2.3%] 3

Cycles

Results (primary 1.4%, secondary -0.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 3.5% [2.2%, 5.9%] 4
Regressions ❌
(secondary)		 4.2% [2.9%, 5.0%] 3
Improvements ✅
(primary)		 -6.8% [-6.8%, -6.8%] 1
Improvements ✅
(secondary)		 -3.1% [-4.2%, -2.3%] 6
All ❌✅ (primary) 1.4% [-6.8%, 5.9%] 5

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 670.062s -> 668.756s (-0.19%)
Artifact size: 316.15 MiB -> 316.02 MiB (-0.04%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
6 participants
@compiler-errors @rustbot @lcnr @bors @rust-log-analyzer @rust-timer